From: Ray Strode <rstrode@redhat.com>
Date: Wed, 18 Mar 2015 16:43:58 +0000 (-0400)
Subject: Revert "loginDialog: Better handle setting the active session"
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1443
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ee360d87493ebaf365c7cd8d641d7aa6d78adba2;p=gnome-shell.git

Revert "loginDialog: Better handle setting the active session"

This reverts commit 681861c8c76cb96ab2a6199df1153202a5c9e292.

https://bugzilla.gnome.org/show_bug.cgi?id=740142
---

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 6cb8d42b5..aaf55f381 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -323,15 +323,13 @@ const SessionMenuButton = new Lang.Class({
         }
     },
 
-    activeSessionChanged: function(sessionId) {
+    setActiveSession: function(sessionId) {
          if (sessionId == this._activeSessionId)
              return;
 
          this._activeSessionId = sessionId;
          this._updateOrnament();
-    },
 
-    setActiveSession: function(sessionId) {
          this.emit('session-activated', this._activeSessionId);
     },
 
@@ -790,7 +788,7 @@ const LoginDialog = new Lang.Class({
     },
 
     _onDefaultSessionChanged: function(client, sessionId) {
-        this._sessionMenuButton.activeSessionChanged(sessionId);
+        this._sessionMenuButton.setActiveSession(sessionId);
     },
 
     _shouldShowSessionMenuButton: function() {